From: Julien Grall Date: Wed, 22 Jun 2016 13:21:01 +0000 (+0100) Subject: xen/arm: Simply the definition of PAGE_SIZE by using the macro _AC X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~773 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=84aac343cc3a721ca4a81edb425ad5ab7ab6f5b5;p=xen.git xen/arm: Simply the definition of PAGE_SIZE by using the macro _AC The macro _AC is used to define constant for both assembly and C. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 9417be6e34..a96f84546c 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -176,12 +176,7 @@ #define FIXMAP_ACPI_END (FIXMAP_ACPI_BEGIN + NUM_FIXMAP_ACPI_PAGES - 1) /* End mappings of ACPI tables */ #define PAGE_SHIFT 12 - -#ifndef __ASSEMBLY__ -#define PAGE_SIZE (1L << PAGE_SHIFT) -#else -#define PAGE_SIZE (1 << PAGE_SHIFT) -#endif +#define PAGE_SIZE (_AC(1,L) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) #define PAGE_FLAG_MASK (~0)